Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sat, 12 Jun 2010 11:47:36 +0000 (11:47 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sat, 12 Jun 2010 11:47:36 +0000 (11:47 +0000)

Trivial merge